From: Raspbian automatic forward porter Date: Sat, 7 Jan 2023 13:44:45 +0000 (+0000) Subject: Merge version 2.11.6+dfsg-4+rpi1 and 2.13.3+dfsg-3 to produce 2.13.3+dfsg-3+rpi1 X-Git-Tag: archive/raspbian/2.13.3+dfsg-3+rpi1~1 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fbfb5394a65651d30977b6a72f013efd6370c260;p=qscintilla2.git Merge version 2.11.6+dfsg-4+rpi1 and 2.13.3+dfsg-3 to produce 2.13.3+dfsg-3+rpi1 --- fbfb5394a65651d30977b6a72f013efd6370c260 diff --cc debian/changelog index 8a612fe,448b359..4e60358 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,53 +1,60 @@@ - qscintilla2 (2.11.6+dfsg-4+rpi1) bookworm-staging; urgency=medium ++qscintilla2 (2.13.3+dfsg-3+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 2.10.2+dfsg-4+rpi1 by Peter Michael Green at Thu, 11 Jan 2018 16:07:42 +0000] + * Add symbols file hack for Raspbian. + - -- Raspbian forward porter Thu, 28 Oct 2021 17:41:06 +0000 ++ -- Raspbian forward porter Sat, 07 Jan 2023 13:44:45 +0000 ++ + qscintilla2 (2.13.3+dfsg-3) unstable; urgency=medium + + * Team upload. + * Copy the right file to pyproject.toml when installing Python bindings. + The install target calls sip-distinfo, which reads pyproject.toml file + to get the metadata. After build, pyproject.toml has contents from + pyproject-qt6.toml, which caused both Qt 5 and Qt 6 variants to get + metadata for Qt 6 variant (closes: #1027416). + * Update debian/libqscintilla2-qt5-15.symbols for mipsel. + + -- Dmitry Shachnev Sat, 31 Dec 2022 21:18:35 +0300 + + qscintilla2 (2.13.3+dfsg-2) unstable; urgency=medium + + * Team upload. + * Update symbols files from buildds’ logs. + * Upload to unstable. + + -- Dmitry Shachnev Mon, 26 Dec 2022 17:04:14 +0300 + + qscintilla2 (2.13.3+dfsg-1) experimental; urgency=medium + + [ Gudjon I. Gudjonsson ] + * New upstream release + * Remove original html files + * Update clean file. + * Add qt6 targets and update build files. + * Update patches. + * Fix clean file + * Fix dependencies for qt6 + * Update symbols table for qt5 (closes: #1013021) + * Add symbols table for qt6 + * Bump standards version to 4.6.1, no changes needed + * Add qt6 designer library and dependency on qt6-tools-dev + * Add qt6 files to not-installed + * Add support for qt5/6 in designer.pro + * debian/copyright. Fix paths and remove configure.py + * debian/*.install. Move include files to arch specific dirs + * debian/libqscintilla2-qt6-15.symbols. Add build depends + * debian/rules. Install qt6 designer plugin + * debian/pyqt6.qsci-dev.lintian-overrides. Add file + * debian/copyright. Remove unused BSD-2 + * debian/control. Set Multi-Arch to same for libqscintilla2-qt5/6-15 + * Remove autogenerated upstream files. + * debian/rules. Fix compilation of Python modules in correct directory + + [ Dmitry Shachnev ] + * Mark some symbols as optional to fix build with LTO (closes: #1015613). + + -- Gudjon I. Gudjonsson Sat, 17 Dec 2022 15:44:33 +0000 qscintilla2 (2.11.6+dfsg-4) unstable; urgency=medium diff --cc debian/rules index 96fa230,c0ca04d..5021d8a --- a/debian/rules +++ b/debian/rules @@@ -17,15 -26,19 +26,22 @@@ endi configure-stamp: dh_testdir + sed -i 's/(arch=armel)/(optional=meh)/' debian/libqscintilla2-qt5-*.symbols + sed -i 's/(arch=!armel)/(optional=meh2)/' debian/libqscintilla2-qt5-*.symbols + sed -i 's/(arch=!armel !riscv64)/(optional=meh3)/' debian/libqscintilla2-qt5-*.symbols # Configuring for Qt5 support mkdir -p QSciQt5 - cp -r Qt4Qt5/* QSciQt5 - cd QSciQt5 && $(DEB_HOST_GNU_TYPE)-qmake DESTDIR=../QSciQt5 $(QMAKE_FLAGS) - cp -r designer-Qt4Qt5 designer-Qt5 - cd designer-Qt5 && $(DEB_HOST_GNU_TYPE)-qmake INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../QSciQt5 DESTDIR=../designer-Qt5 $(QMAKE_FLAGS) + cp -r src/* QSciQt5 + cd QSciQt5 && /usr/bin/qmake -qt=5 DESTDIR=../QSciQt5 $(QMAKE_FLAGS) + cp -r designer designer-Qt5 + cd designer-Qt5 && /usr/bin/qmake -qt=5 INCLUDEPATH+=../src QMAKE_LIBDIR+=../QSciQt5 DESTDIR=../designer-Qt5 $(QMAKE_FLAGS) + ifeq ($(qt6), "yes") + mkdir -p QSciQt6 + cp -r src/* QSciQt6 + cd QSciQt6 && /usr/bin/qmake6 DESTDIR=../QSciQt6 $(QMAKE_FLAGS) + cp -r designer designer-Qt6 + cd designer-Qt6 && /usr/bin/qmake6 INCLUDEPATH+=../src QMAKE_LIBDIR+=../QSciQt6 DESTDIR=../designer-Qt6 $(QMAKE_FLAGS) + endif touch $@ override_dh_auto_configure: configure-stamp